From ad7f6c5250b621a61acb5f9cf0e9e15d5a67a7f6 Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Tue, 8 Nov 2005 11:56:55 +0100 Subject: [PATCH] 1. Unmark the 07 and 08 tests of block_attach as XFAIL 2. Change the MEM_PER_DOM amount in 11_create_concurrent to 24MB, so that the test will run on x86_64. 3. Increase the number of DomUs created in 12_create_concurrent to 5 4. Fix a logic error in 01_unpause 5. Add a test 06_help that checks all xm commands with 0-10 arguments to make sure none of them traceback with varying argument counts. Signed-off-by: Dan Smith --- tools/xm-test/tests/block-create/Makefile.am | 4 ---- tools/xm-test/tests/create/11_create_concurrent_pos.py | 2 +- .../xm-test/tests/create/12_create_concurrent_stress_pos.py | 2 +- tools/xm-test/tests/help/Makefile.am | 3 ++- tools/xm-test/tests/list/06_list_nonroot.py | 1 - tools/xm-test/tests/memset/Makefile.am | 4 ++-- tools/xm-test/tests/unpause/01_unpause_basic_pos.py | 5 +++-- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/xm-test/tests/block-create/Makefile.am b/tools/xm-test/tests/block-create/Makefile.am index 095f4c533a..a9b01a6593 100644 --- a/tools/xm-test/tests/block-create/Makefile.am +++ b/tools/xm-test/tests/block-create/Makefile.am @@ -12,10 +12,6 @@ TESTS = 01_block_attach_device_pos.test \ DISABLED = -XFAIL_TESTS = 07_block_attach_baddevice_neg.test \ - 08_block_attach_bad_filedevice_neg.test - - EXTRA_DIST = $(TESTS) $(XFAIL_TESTS) TESTS_ENVIRONMENT=@TENV@ diff --git a/tools/xm-test/tests/create/11_create_concurrent_pos.py b/tools/xm-test/tests/create/11_create_concurrent_pos.py index 49de4d05e8..5dd473d0dc 100644 --- a/tools/xm-test/tests/create/11_create_concurrent_pos.py +++ b/tools/xm-test/tests/create/11_create_concurrent_pos.py @@ -10,7 +10,7 @@ import random MIN_DOMS = 10 MAX_DOMS = 50 -MEM_PER_DOM = 16 +MEM_PER_DOM = 24 domains = [] console = [] diff --git a/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py b/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py index ddaaaf2581..e4e925d742 100644 --- a/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py +++ b/tools/xm-test/tests/create/12_create_concurrent_stress_pos.py @@ -7,7 +7,7 @@ from XmTestLib import * import time -DOMS=2 +DOMS=5 MEM=32 DUR=60 diff --git a/tools/xm-test/tests/help/Makefile.am b/tools/xm-test/tests/help/Makefile.am index 35cc526efb..7319f37ec9 100644 --- a/tools/xm-test/tests/help/Makefile.am +++ b/tools/xm-test/tests/help/Makefile.am @@ -4,7 +4,8 @@ TESTS = 01_help_basic_pos.test \ 02_help_basic_neg.test \ 03_help_badparm_neg.test \ 04_help_long_pos.test \ - 05_help_nonroot_pos.test + 05_help_nonroot_pos.test \ + 06_help_allcmds.test XFAIL_TESTS = diff --git a/tools/xm-test/tests/list/06_list_nonroot.py b/tools/xm-test/tests/list/06_list_nonroot.py index 0acfc9891f..7b61508cb7 100644 --- a/tools/xm-test/tests/list/06_list_nonroot.py +++ b/tools/xm-test/tests/list/06_list_nonroot.py @@ -2,7 +2,6 @@ # Copyright (C) International Business Machines Corp., 2005 # Copyright (C) XenSource Ltd, 2005 -# Author: Woody Marvel # Author: Ewan Mellor from XmTestLib import * diff --git a/tools/xm-test/tests/memset/Makefile.am b/tools/xm-test/tests/memset/Makefile.am index d24c6405d2..09c3bac472 100644 --- a/tools/xm-test/tests/memset/Makefile.am +++ b/tools/xm-test/tests/memset/Makefile.am @@ -2,8 +2,8 @@ SUBDIRS = TESTS = 01_memset_basic_pos.test \ 02_memset_badparm_neg.test \ - 04_memset_smallmem_pos.test \ - 03_memset_random_pos.test + 03_memset_random_pos.test \ + 04_memset_smallmem_pos.test XFAIL_TESTS = diff --git a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py index ffa7ffaea3..a4e5c3c65a 100644 --- a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py +++ b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py @@ -74,14 +74,15 @@ except ConsoleError, e: FAIL(str(e)) try: run = console.runCmd("ls") - #If we get here, console attached to paused domain (unexpected) - FAIL("console attached to supposedly paused domain") except ConsoleError, e: pass # Close the console console.closeConsole() +if run["return"] != 0: + FAIL("console failed to attach to supposedly unpaused domain") + # Stop the domain (nice shutdown) domain.stop() -- 2.30.2